Skip to content

Content models #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ericlieu12 wants to merge 2 commits into
base: main-clone
Choose a base branch
from
Open

Content models #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61710b9
fixed color scheme for application, changed "email" to "username", an…
cassamb Apr 6, 2021
7e468cb
adding welcome message for the user on home page
cassamb Apr 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .vs/ACE Web Based Learning System/config/applicationhost.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
</site>
<site name="ACE Web Based Learning System" id="2">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\Users\ericl\ACCE-Web-Based-Learning-System\ACE Web Based Learning System" />
<virtualDirectory path="/" physicalPath="C:\CSIS3750\ACE_Project\ACE Web Based Learning System" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:58008:localhost" />
Expand Down
7,675 changes: 7,673 additions & 2 deletions ACE Web Based Learning System/Content/material.min.css
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions ACE Web Based Learning System/Views/Home/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
ViewBag.Title = "Home Page";
}

<h1 style="padding-left: 250px">Welcome @Model.FirstName,</h1>
80 changes: 28 additions & 52 deletions ACE Web Based Learning System/Views/Shared/UserLayout.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,61 +1,56 @@
@model ACE_Web_Based_Learning_System.Models.User
@{
var userContent = Session["UserContent"] as ACE_Web_Based_Learning_System.Models.UserContent;
var courses = Session["Courses"] as List<ACE_Web_Based_Learning_System.Models.Enrollment>;
}
@{
var userContent = Session["UserContent"] as ACE_Web_Based_Learning_System.Models.UserContent;
var courses = Session["Courses"] as List<ACE_Web_Based_Learning_System.Models.Enrollment>;
}

<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>@ViewBag.Title</title>

<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">

<!-- Optional theme -->
<!-- I notice that the signup page only renders correctly when I import the bootstrap stylesheets manually
rather than using the format below. Also, I'm not sure how to determine the order of the pages like
starting from the Login and then going to the home page, so hopefully you have better luck with it than I did. -->
<style>
.userCard {
display:flex;
flex-direction: column;
width: 300px;

text-align:center;
color:black;
font-size: 18px;

display: flex;
flex-direction: column;
width: 300px;
text-align: center;
color: black;
font-size: 18px;
}

.userInfo {
display: flex;
flex-direction: column;
margin-bottom: 20px;

}

.dropdown-menu-center {
right: auto;
left: 17%;
-webkit-transform: translate(-83%, 5%);
-o-transform: translate(-83%, 5%);
transform: translate(-83%, 5%);
}
.userButton{
background-color:transparent
; border-top-style:solid;
border-width: 1px;
padding-top: 10px;
color: gray;
border-color: lightgray;
margin-top: 10px;
cursor: pointer;

.userButton {
background-color: transparent;
border-top-style: solid;
border-width: 1px;
padding-top: 10px;
color: black;
border-color: #37464f;
margin-top: 10px;
cursor: pointer;
}
</style>
@Styles.Render("~/Content/css")
@Scripts.Render("~/bundles/modernizr")
</head>
<body>

<body>
<div class="mdl-layout mdl-js-layout mdl-layout--fixed-header">
<header class="mdl-layout__header">
<div class="mdl-layout__header-row">
Expand All @@ -65,27 +60,20 @@ font-size: 18px;
<div class="mdl-layout-spacer"></div>
<!-- Navigation. We hide it in small screens. -->
<nav class="mdl-navigation mdl-layout--large-screen-only">

<div class="dropdown">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<span class="material-icons">face</span>

</button>
<ul class="dropdown-menu dropdown-menu-center" aria-labelledby="dropdownMenu1">
<li>
<div class="userCard">
<div class="userInfo">
<span class="material-icons" style="font-size: 100px;">face</span>
<div> @Model.FirstName @Model.LastName</div>

<div style="color: lightgray"> @userContent.Email</div>
</div>
<div id="manageButton" class="userButton">
Manage your account settings
</div>
<div id="signOutButton" class="userButton">
Sign out
<div>@Model.FirstName @Model.LastName</div>
<div style="color: black"> @userContent.Email</div>
</div>
<div id="manageButton" class="userButton">Manage Account Settings</div>
<div id="signOutButton" class="userButton">Sign Out</div>
</div>
</li>
</ul>
Expand All @@ -94,34 +82,22 @@ font-size: 18px;
</div>
</header>
<div class="mdl-layout__drawer">

<nav class="mdl-navigation">

<a class="mdl-navigation__link" href="">@courses[0].Section.Course.CourseName</a>
<a class="mdl-navigation__link" href="">Link</a>
<a class="mdl-navigation__link" href="">Link</a>

</nav>
</div>
<main class="mdl-layout__content">
<div class="page-content"> @RenderBody()</div>
</main>
</div>



@Scripts.Render("~/bundles/jquery")
@Scripts.Render("~/bundles/bootstrap")
@RenderSection("scripts", required: false)

<script>
document.getElementById("manageButton").addEventListener("click", function () {


window.location.href = "/Users/UserSettings";



});
</script>
</body>
Expand Down
31 changes: 12 additions & 19 deletions ACE Web Based Learning System/Views/User/LoginPage.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@

@{
@{
Layout = "~/Views/Shared/_Layout.cshtml";
ViewBag.Title = "ACE - Learning Management System";
}


@Styles.Render("~/Content/css")
@Scripts.Render("~/bundles/modernizr")

<style>
body {
font-family: "Lato", sans-serif;
Expand All @@ -27,7 +25,7 @@

.sidenav {
height: 100%;
background-color: rgb(63,81,181);
background-color: #37464f;
overflow-x: hidden;
padding-top: 20px;
}
Expand All @@ -42,7 +40,6 @@
}
}


@@media screen and (max-width: 450px) {
.login-form {
margin-top: 10%;
Expand Down Expand Up @@ -75,22 +72,22 @@
}
}


.login-main-text {
margin-top: 20%;
padding: 60px;
color: #fff;
}

.login-main-text h2 {
font-weight: 300;
}
.login-main-text h2 {
font-weight: 300;
}

.btn-black {
background-color: #000 !important;
color: #fff;
}
</style>

<div class="sidenav">
<div class="login-main-text">
<h1>ACE</h1>
Expand All @@ -102,29 +99,25 @@
<div class="main">
<div class="col-md-6 col-sm-12">
<div class="login-form">

<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input class="mdl-textfield__input" type="text" id="emailInput">
<label class="mdl-textfield__label" for="emailInput">Email</label>
<label class="mdl-textfield__label" for="emailInput">Username</label>
<span class="mdl-textfield__error">Must not be empty!</span>
</div>
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input class="mdl-textfield__input" type="text" id="passwordInput">
<input class="mdl-textfield__input" type="password" id="passwordInput">
<label class="mdl-textfield__label" for="passwordInput">Password</label>
<span class="mdl-textfield__error">Must not be empty!</span>
</div>
<br />
<button id="submit" class="mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--accent">
Login
</button>
<br>
<button id="submit" class="mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--accent">Login</button>
<a href="EmailConfirmation.html">Forgot Password?</a>
<br><br>
<p>Don't have an account? Sign up <a href="SignUp.html">here</a>.</p>

</div>
</div>

</div>

@Scripts.Render("~/bundles/jquery")
@Scripts.Render("~/bundles/bootstrap")
<script src="//cdn.jsdelivr.net/npm/sweetalert2@10"></script>
Expand Down