Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
139 commits
Select commit Hold shift + click to select a range
bf53afc
Added in the icons, the background color, and started to handle ancho…
Apr 1, 2025
a07180a
Got a better idea of a navbar. Working on styling to make it easier f…
Apr 4, 2025
43eb1f5
Created Repo and Settings page
Beleebs Apr 5, 2025
bd86859
About
nneiten1 Apr 5, 2025
b98b0da
Update
nneiten1 Apr 5, 2025
78e7908
quick save so I can work on my desktop
Beleebs Apr 5, 2025
8969d47
Settings page created, currently unstyled.
Beleebs Apr 6, 2025
5a333ce
Small update in the approach comment for better clarity
Beleebs Apr 6, 2025
6545e8a
Update About.jsx
nneiten1 Apr 6, 2025
00ecd95
added profile page component
GennieG2 Apr 6, 2025
caa299b
imported pages to App.jsx
GennieG2 Apr 6, 2025
61c8253
merge
nneiten1 Apr 6, 2025
be7a64c
merge
nneiten1 Apr 6, 2025
11d40c4
boostrap about
nneiten1 Apr 6, 2025
02250bc
About Page
nneiten1 Apr 6, 2025
d5a2f60
Removed tailwind and starting to style with Bootstrap
Apr 7, 2025
6f4a88c
Added some of the icons and having it scale things. Need to fix some …
Apr 7, 2025
5a935d3
Added some basic login elements and the form. Now need to make the ba…
Apr 4, 2025
8a97683
Made a basic API with express.js and have a couple of API endpoints a…
Apr 6, 2025
8e8580a
small update
Beleebs Apr 7, 2025
4ab0cb4
About Page
nneiten1 Apr 7, 2025
53e8b30
Started home screen, still learning bootstrap
SunCh1p Apr 7, 2025
b4acca9
Merge branch 'main' into navBar
SunCh1p Apr 7, 2025
e696c17
Merge pull request #32 from eHag-FRU/navBar
SunCh1p Apr 7, 2025
9cb8b61
Merge branch 'HomePage' into navBar
SunCh1p Apr 7, 2025
92c64b7
Merge pull request #31 from eHag-FRU/navBar
SunCh1p Apr 7, 2025
ada92a6
added a bit more work to home page, still figuring out how to center …
SunCh1p Apr 8, 2025
7ee56d7
Merge branch 'main' of https://github.com/eHag-FRU/ZoomZoomType into …
Beleebs Apr 8, 2025
625f2d6
Finished home page, will make buttons dynamic in future
SunCh1p Apr 8, 2025
651cf42
Merge pull request #33 from eHag-FRU/HomePage
SunCh1p Apr 8, 2025
7fb50f9
started gamepage, modified navbar to use react links, added nav-achor…
SunCh1p Apr 9, 2025
70b704c
Merge pull request #34 from eHag-FRU/HomePage
SunCh1p Apr 9, 2025
1e68cbd
The DB connects and reaches out to check if the password is correct b…
Apr 10, 2025
cb1ec89
The error message now appears dynamically and the wpm is appearing up…
Apr 10, 2025
3b03cc0
removed the print() statement
Apr 10, 2025
afd3441
Merge branch 'GamePage' into loginPage
SunCh1p Apr 10, 2025
5e07c03
Merge pull request #35 from eHag-FRU/loginPage
SunCh1p Apr 10, 2025
10571e3
deleted thing
SunCh1p Apr 10, 2025
c97da55
Fixed outputting wpm to navbar, added fallback get request for all ro…
SunCh1p Apr 10, 2025
4515fbf
started work on typing game
SunCh1p Apr 10, 2025
349e7bb
Working on implementing typing functionality that matches to text
SunCh1p Apr 10, 2025
c4eb8e5
Added primitive live text tracking
SunCh1p Apr 10, 2025
72219c7
added live character updating, need to add caret in future
SunCh1p Apr 10, 2025
aaf8f30
added blinking caret, still some minor bugs, will add comments to cod…
SunCh1p Apr 11, 2025
c3079cb
fixed About page
nneiten1 Apr 11, 2025
cf490a5
Added timer that starts when the the start button is pushed
SunCh1p Apr 12, 2025
3e13ec3
added a way to track wpm while user is typing
SunCh1p Apr 12, 2025
ebe645b
added focusing on input when game starts
SunCh1p Apr 12, 2025
b3e8fdc
Got some of the cookie stuff working
Apr 15, 2025
32ff571
Merge pull request #37 from eHag-FRU/GamePage
eHag-FRU Apr 15, 2025
2bf157f
Merge branch 'main' into loginPage
eHag-FRU Apr 15, 2025
ddd5193
Merge pull request #36 from eHag-FRU/loginPage
eHag-FRU Apr 15, 2025
a8f508b
Merge pull request #38 from eHag-FRU/loginPage
eHag-FRU Apr 16, 2025
8bc8dcf
Finished up handling the cookies and also got the login page centered
Apr 16, 2025
88749c2
Finished the footer and removed the excess old navbar code from the A…
Apr 16, 2025
9bb3817
Merge pull request #39 from eHag-FRU/loginPage
eHag-FRU Apr 16, 2025
38d539e
Got the centering and size fixed
Apr 16, 2025
87befdc
Merge pull request #40 from eHag-FRU/loginPage
eHag-FRU Apr 16, 2025
bf2921b
Merge pull request #41 from eHag-FRU/main
SunCh1p Apr 16, 2025
45366d0
Fixed repositioning bug when typing
SunCh1p Apr 16, 2025
18b0043
completely changed how stuff renders
SunCh1p Apr 17, 2025
1f8c49c
just some changes with how sizing is handled, working on dynamic sizi…
SunCh1p Apr 17, 2025
a36694c
Added functionality to calculate characters per line, not implemented…
SunCh1p Apr 17, 2025
55b03e7
started new rendering logic
SunCh1p Apr 17, 2025
63670d4
started new rendering logic
SunCh1p Apr 17, 2025
02dcf56
Added in a column for the seconds for the game. Still working out the…
Apr 21, 2025
9010c6e
Got deleting a user account working fully
Apr 22, 2025
c1c53ae
got the wpm total and gamesPlayed endpoint done
Apr 22, 2025
4f2c1e8
Added an example on the frontend of how to call API for gamesPlayed
Apr 22, 2025
61a1c8b
Added in shells for the updating emails, passwords, and usernames in …
Apr 22, 2025
b5f5209
Got update email fully working
Apr 22, 2025
3572da9
Updating the username finished
Apr 22, 2025
9054e90
Password updating working
Apr 22, 2025
bbcb7c8
Got the example gamesPlayed finished
Apr 22, 2025
20be5f8
Added in Leader Board
Apr 23, 2025
7a72383
Merge branch 'main' of https://github.com/eHag-FRU/ZoomZoomType into …
Beleebs Apr 23, 2025
b66793a
Settings restylized, getting states ready for theme/font/layout/sfx
Beleebs Apr 23, 2025
d3875d3
Leader board fully working
Apr 23, 2025
c0efb92
finished moving around the leader board position
Apr 23, 2025
744daed
Merge pull request #42 from eHag-FRU/leaderBoard-backend&DB
eHag-FRU Apr 23, 2025
8602604
Merge pull request #45 from eHag-FRU/main
SunCh1p Apr 24, 2025
877345c
Starting to figure out rendering logic for doing it character by char…
SunCh1p Apr 24, 2025
ad43563
attempting to get the state functionality, it might need a router
Beleebs Apr 24, 2025
a4f552c
Settings buttons partly working, does not change the layout or SFX
Beleebs Apr 24, 2025
f537591
Merge branch 'main' into profile-backend&DB
Apr 24, 2025
300b904
Merge pull request #51 from eHag-FRU/profile-backend&DB
eHag-FRU Apr 24, 2025
8c255ac
Update routes.js
Apr 24, 2025
e7cfcbd
Merge branch 'main' into leaderBoard-backend&DB
Apr 24, 2025
c253c69
Got posting of a new game result working
Apr 24, 2025
de4e24e
Corrected the nav bar link for the game page
Apr 24, 2025
1a4d204
Merge pull request #52 from eHag-FRU/leaderBoard-backend&DB
eHag-FRU Apr 24, 2025
88fb2b6
Got the API call and SQL finished and returning the id and quote back…
Apr 24, 2025
c8a8797
Merge pull request #53 from eHag-FRU/randomQuoteSelection---Backend-&-DB
eHag-FRU Apr 24, 2025
19fd357
API endpoint and DB query has been made, now working on error message
Apr 24, 2025
a2be9b4
character rendering almost done
SunCh1p Apr 24, 2025
1fcb15b
Added a 500 error if account with email already exists
Apr 24, 2025
331aaff
Put the axios call in a comment about the route
Apr 24, 2025
9b062e7
Merge pull request #54 from eHag-FRU/accountCreation-DB&APICall
eHag-FRU Apr 24, 2025
d4c2304
Updated fonts, next working on theme/sfx
Beleebs Apr 24, 2025
d634c00
added sfx
Beleebs Apr 24, 2025
7f2fe00
Small changes to the audio options, not sure if I will be able to imp…
Beleebs Apr 24, 2025
8856fb8
Create zoomLogo.png
nneiten1 Apr 24, 2025
a9ddbe5
Finished dynamic word rendering system
SunCh1p Apr 25, 2025
b3fa8a5
Merge pull request #55 from eHag-FRU/GamePage
SunCh1p Apr 25, 2025
dcefa7e
Merge pull request #56 from eHag-FRU/main
SunCh1p Apr 25, 2025
76b344a
about us
nneiten1 Apr 25, 2025
e548580
working on getting post request working, wpm isn't being record prope…
SunCh1p Apr 25, 2025
fd0cb4f
Profile Page & Edit Profile Page
GennieG2 Apr 25, 2025
109b52a
Merge branch 'main' into ProfilePage
eHag-FRU Apr 25, 2025
f0398be
Merge pull request #57 from eHag-FRU/ProfilePage
eHag-FRU Apr 25, 2025
617905c
lined up images, made about us description
nneiten1 Apr 25, 2025
0a86897
small logo alignment
nneiten1 Apr 26, 2025
7a0f294
fixed first section alignment
nneiten1 Apr 26, 2025
23dde80
Got the profile pages profile data call made. Changed DB schema to al…
Apr 26, 2025
148eca4
Merge pull request #59 from eHag-FRU/profileDataAPICall
eHag-FRU Apr 26, 2025
b36c4c8
about us page
nneiten1 Apr 26, 2025
efcb7ff
Merge branch 'main' into About-Page
Apr 26, 2025
57c343f
Merge pull request #58 from eHag-FRU/About-Page
eHag-FRU Apr 26, 2025
a272def
Finished classic mode with scores in posted in database. Took a minut…
SunCh1p Apr 27, 2025
62e82f9
Spreading theme changes across app
Beleebs Apr 27, 2025
a2a0198
Added quotes game mode, not entirely complete yet
SunCh1p Apr 27, 2025
edfd437
Gamemodes page filled, app.css updated
Beleebs Apr 27, 2025
11d8a3a
Merge branch 'SettingsPage' into GamePage
Beleebs Apr 27, 2025
d55be0b
Merge pull request #60 from eHag-FRU/GamePage
Beleebs Apr 27, 2025
aa1d4c6
Refactored button consistency, ALL navbar icons now work with theme
Beleebs Apr 27, 2025
9b0c782
Finished Quotes Game mode
SunCh1p Apr 27, 2025
d85a437
Merge branch 'GamePage' of https://github.com/eHag-FRU/ZoomZoomType i…
SunCh1p Apr 27, 2025
a9b26e4
99% of website formatted by theme settings
Beleebs Apr 27, 2025
b171f06
quote gamemode finished
SunCh1p Apr 27, 2025
77077ec
Merge branch 'GamePage' into SettingsPage
SunCh1p Apr 27, 2025
66c5fcc
Fixed the formatting of each component for better merging
Beleebs Apr 27, 2025
df7ac94
Added 4 new themes
Beleebs Apr 27, 2025
39e5fa9
fixed navbar styles
Beleebs Apr 27, 2025
4b44427
Fixed the gamemodes themes and the home themes/routing
Beleebs Apr 27, 2025
d0d75af
Updated the database scheme to be more accurate in what it records
Apr 27, 2025
10d8126
Merge branch 'main' into SettingsPage
eHag-FRU Apr 27, 2025
62109e4
Merge pull request #66 from eHag-FRU/SettingsPage
eHag-FRU Apr 27, 2025
68ab515
Fixed the login button styling from clear to the theme color
Apr 27, 2025
b186faa
Merge branch 'Register' into updatedRegisterPage
eHag-FRU Apr 27, 2025
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
24 changes: 24 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
.PHONY: all run runC build buildS buildC clean

all: clean build run

run:
@-node server/app.js

runC:
@-npm run dev --prefix client

build: buildC buildS

buildC:
@-npm i --prefix client
@-npm run build --prefix client

buildS:
@-npm i --prefix server

clean:
@-rm -r client/dist
@-rm -r client/package-lock.json
@-rm -r client/node_modules
@-rm -r server/node_modules
16 changes: 8 additions & 8 deletions client/README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ZoomZoom Type

An ExpressJS Typing Game

Currently, two official plugins are available:

- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md) uses [Babel](https://babeljs.io/) for Fast Refresh
- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
ZoomZoom Type
An ExpressJS Typing Game
Currently, two official plugins are available:
- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md) uses [Babel](https://babeljs.io/) for Fast Refresh
- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
66 changes: 33 additions & 33 deletions client/eslint.config.js
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
import js from '@eslint/js'
import globals from 'globals'
import reactHooks from 'eslint-plugin-react-hooks'
import reactRefresh from 'eslint-plugin-react-refresh'

export default [
{ ignores: ['dist'] },
{
files: ['**/*.{js,jsx}'],
languageOptions: {
ecmaVersion: 2020,
globals: globals.browser,
parserOptions: {
ecmaVersion: 'latest',
ecmaFeatures: { jsx: true },
sourceType: 'module',
},
},
plugins: {
'react-hooks': reactHooks,
'react-refresh': reactRefresh,
},
rules: {
...js.configs.recommended.rules,
...reactHooks.configs.recommended.rules,
'no-unused-vars': ['error', { varsIgnorePattern: '^[A-Z_]' }],
'react-refresh/only-export-components': [
'warn',
{ allowConstantExport: true },
],
},
},
]
import js from '@eslint/js'
import globals from 'globals'
import reactHooks from 'eslint-plugin-react-hooks'
import reactRefresh from 'eslint-plugin-react-refresh'
export default [
{ ignores: ['dist'] },
{
files: ['**/*.{js,jsx}'],
languageOptions: {
ecmaVersion: 2020,
globals: globals.browser,
parserOptions: {
ecmaVersion: 'latest',
ecmaFeatures: { jsx: true },
sourceType: 'module',
},
},
plugins: {
'react-hooks': reactHooks,
'react-refresh': reactRefresh,
},
rules: {
...js.configs.recommended.rules,
...reactHooks.configs.recommended.rules,
'no-unused-vars': ['error', { varsIgnorePattern: '^[A-Z_]' }],
'react-refresh/only-export-components': [
'warn',
{ allowConstantExport: true },
],
},
},
]
13 changes: 12 additions & 1 deletion client/index.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,23 @@
<!doctype html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>ZoomZoom Type</title>
<link
href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.5/dist/css/bootstrap.min.css"
rel="stylesheet"
integrity="sha384-SgOJa3DmI69IUzQ2PVdRZhwQ+dy64/BUtbMJw1MZ8t5HZApcHrRKUc4W0kG879m7"
crossorigin="anonymous"
/>
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/main.jsx"></script>
<script
src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.5/dist/js/bootstrap.bundle.min.js"
integrity="sha384-k6d4wzSIapyDyv1kpU366/PK5hCdSbCRGRCMv+eplOQJWyd1fbcAu9OCUj5zNLiq"
crossorigin="anonymous"
></script>
</body>
</html>
Loading