Skip to content

Commit

Permalink
reconciled auth conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
PreciousIfeaka committed Jun 7, 2024
1 parent fb2ba17 commit b6f2050
Show file tree
Hide file tree
Showing 15 changed files with 349 additions and 125 deletions.
169 changes: 169 additions & 0 deletions server/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@
"dependencies": {
"bcrypt": "^5.1.1",
"connect-mongo": "^5.1.0",
"connect-mongodb-session": "^5.0.0",
"cookie": "^0.6.0",
"cookie-parser": "^1.4.6",
"crypto": "^1.0.1",
"ejs": "^3.1.10",
"express": "^4.19.2",
"express-session": "^1.18.0",
"fs": "^0.0.1-security",
Expand Down
47 changes: 34 additions & 13 deletions server/public/home_page.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,30 @@
<h1 class="welcome-text">Welcome!</h1>

<nav class="navbar">
<a href="#" class="active">Home</a>
<a href="#">About</a>
<a href="#">Contact</a>
<a href="/logout">Logout</a>
<div class="drop-down">
<a href="/home" class="active">Home</a>
</div>
<div class="drop-down">
<a>About</a>
<div class="dropdown-content">
<ul class="about-list">
<li>An online Interactive quiz platform</li>
<li>Aimed at helping you have quiz sessioons</li>
<li>For fun and knowledge</li>
</ul>
</div>
</div>
<div class="drop-down">
<a>Contact</a>
<div class="dropdown-content">
<p><a href=[email protected]>Link to my email</a></p>
<p><a href="https://www.linkedin.com/in/precious-enuagwune-029b311b3/">Link to my linkedin</a></p>
<p><a href="https://github.com/PreciousIfeaka">Link to my GitHub</a></p>
</div>
</div>
<div class="drop-down">
<a href="/logout">Logout</a>
</div>
</nav>
</header>

Expand All @@ -39,10 +59,12 @@ <h1 class="welcome-text">Welcome!</h1>

<section class="home">
<div class="home-content">
<h1>QUIZzar!</h1>
<p>Baby red chinehgd heufyuf gfuysgyd gdtytdi duyduyft
dhudyuf gdguyyuwh. uyfufgugyui ggcggc cuddutf gfgfgdu
gvfguvf vfufgyf vfuvtfytf </p>
<h1>QUIZzar</h1>
<p>QUIZzar is an interactive trivia quiz website where you can have
quiz sessions based on the topic area you have chosen.
On taking this quiz, you will be exposed to questions that will improve your knowledge-based.
<br>Happy quizing!
</p>
<button class="start-btn">Start Quiz</button>
</div>
</section>
Expand All @@ -51,14 +73,13 @@ <h1>QUIZzar!</h1>

<div class="quiz-popup">
<h2>QUIZzar Session Guide</h2>
<span class="info">1. Click on the take a quiz button</span>
<span class="info">1. Click on the take a Continue button</span>
<span class="info">2. Select the quiz topic you want from the quiz field popup</span>
<span class="info">3. Click on the process to quiz button</span>
<span class="info">4. Select the number of questions you want to answer</span>
<span class="info">5. Click on proceed.</span>
<span class="info">3. Select the number of questions you want to answer</span>
<span class="info">4. Click on proceed.</span>

<div class="btn-group">
<button class="exit-quiz">Exit Quiz</button>
<button class="exit-quiz">Back</button>
<button class="continue-btn">Continue</button>
</div>
</div>
Expand Down
5 changes: 4 additions & 1 deletion server/public/login_page.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,11 @@ <h2>QUIZzar</h2>
<div class="divider-line"></div>
</div>

<a href="/auth/google">
<button class="google-signin">
<img src="images/google icon.jpg" alt="Google icon" class="google-icon"><a href="/auth/google">Continue with Google</a></button>
<img src="images/google icon.jpg" alt="Google icon" class="google-icon">Continue with Google</button>
</a>

<div class="sign-in">
<p>New to QUIZzar? <a href="/user/register">Sign up</a></p>
</div>
Expand Down
Loading

0 comments on commit b6f2050

Please sign in to comment.