Skip to content

WIP : Modernizing Client #99

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.

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

Draft
wants to merge 31 commits into
base: development
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
eec8d41
Merge pull request #95 from do-kevin/development
do-kevin Apr 22, 2023
fcc40ee
Bump dottie from 2.0.2 to 2.0.4
dependabot[bot] Jun 12, 2023
02f7f1c
:arrow_up: migrate dependencies to be compatible with React 17
dependabot[bot] Jun 12, 2023
77c4d24
:art: move key props & <p> semantic html
do-kevin Jun 13, 2023
29e2811
:adhesive_bandage: GitHub image path
do-kevin Jun 13, 2023
8a2b083
:tada: scaffold React Vite client
do-kevin Jun 13, 2023
12d1d35
:building_construction: setting up testing w/ Jest & MSW
do-kevin Jun 22, 2023
b83505a
update: some treeshaking and isolate dependency
do-kevin Jun 23, 2023
124abc9
:construction: :coffin: combining Inversify w/ Redux attempt
do-kevin Jun 23, 2023
44a7e8a
:art: :construction: sets up testable architecture for deck list
do-kevin Jun 24, 2023
6263bf2
:white_check_mark: sets up test for loading decks
do-kevin Jul 4, 2023
a692381
:art: move Providers into react-ui folder & more
do-kevin Jul 4, 2023
f613afb
:art: replace mobx and inversify w/ redux
do-kevin Jul 4, 2023
bb347a3
:white_check_mark: tests public deck loading w/ redux
do-kevin Jul 4, 2023
786d1dd
update: rename vm
do-kevin Sep 24, 2023
0b56863
update: can mock implementation of http gateway
do-kevin Sep 25, 2023
2c2c06e
:lipstick: add dummy ui for discover flashcard decks page
do-kevin Sep 25, 2023
746fa74
:construction: :lipstick: Flashcard Search shows a result list pop up
do-kevin Nov 7, 2023
cbae4a1
:lipstick: :construction: adds initial flow for showing results and i…
do-kevin Nov 8, 2023
5711ac0
:sparkles: adds pagination for DiscoverFlashcardPage
do-kevin Nov 14, 2023
ba96098
Merge pull request #104 from do-kevin/feat-discover-flashcards
do-kevin Nov 14, 2023
ff676f9
chore: can compile Bootstrap scss to css
do-kevin Nov 29, 2023
062dec0
:construction: extending border
do-kevin Dec 1, 2023
165a984
:construction: border (not border color) is responsive
do-kevin Dec 2, 2023
edf9e78
:lipstick: responsively show decks' card cover
do-kevin Dec 3, 2023
64557e9
:contruction: flashcard deck cover concept
do-kevin Dec 3, 2023
2459663
update: additional fs classes
do-kevin Dec 6, 2023
eb221f9
update: tweak focus styles & navbar
do-kevin Dec 8, 2023
77d2900
:construction: responsive button background color & state
do-kevin Dec 13, 2023
0e4478c
:art: generate active & hover styles for button color
do-kevin Dec 13, 2023
a80f4ec
Merge pull request #105 from do-kevin/chore-custom-theme
do-kevin Dec 13, 2023
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
31 changes: 14 additions & 17 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,30 +22,27 @@
}
],
"private": true,
"proxy": "http://0.0.0.0:$PORT/",
"proxy": "http://127.0.0.1:3001/",
"license": "GNU GPLv3",
"dependencies": {
"axios": "^0.16.2",
"dompurify": "^1.0.8",
"logrocket": "^0.6.19",
"moment": "^2.22.2",
"node-pre-gyp": "^0.17.0",
"node-sass": "npm:sass",
"nuka-carousel": "^4.4.5",
"react": "^16.6.0",
"react-datetime-picker": "^2.0.0",
"react-dom": "^16.6.0",
"react-flippy": "^0.1.2",
"react-quill": "^1.3.3",
"react-router-dom": "^4.3.1",
"react-router-hash-link": "^1.2.1",
"react-scripts": "2.0.3",
"reactstrap": "^7.0.2",
"sass": "^1.62.0",
"styled-components": "^4.1.3"
"nuka-carousel": "4.8.0",
"react": "17.0.0",
"react-datetime-picker": "3.3.0",
"react-dom": "17.0.0",
"react-flippy": "^1.1.0",
"react-quill": "1.3.5",
"react-router-dom": "5.3.4",
"react-router-hash-link": "2.4.3",
"react-scripts": "4.0.0",
"reactstrap": "8.9.0",
"sass": "^1.63.3",
"styled-components": "5.3.3"
},
"scripts": {
"start": "react-scripts --openssl-legacy-provider start",
"start": "react-scripts start",
"build": "react-scripts --openssl-legacy-provider build",
"test": "react-scripts test --env=jsdom",
"eject": "react-scripts eject"
Expand Down
3 changes: 2 additions & 1 deletion client/src/App.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React, { Component } from "react";
import { BrowserRouter as Router, Route, Redirect } from "react-router-dom";
import axios from "axios";
import GithubIcon from "./img/github.png";

// Pages
import Home from "./pages/Home";
Expand Down Expand Up @@ -190,7 +191,7 @@ class App extends Component {
>
<img
className="github-btn__logo"
src={require("./img/github.png")}
src={GithubIcon}
alt="github logo"
/>
</a>{" "}
Expand Down
4 changes: 1 addition & 3 deletions client/src/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import React from "react";
import ReactDOM from "react-dom";
import App from "./App";
import './css/Global.scss';
import "./css/Global.scss";
import "./css/balloon.min.css";
import LogRocket from 'logrocket';

ReactDOM.render(<App />, document.querySelector("#root"));
LogRocket.init('d6pvgs/zephyr-node');
3 changes: 1 addition & 2 deletions client/src/pages/Flashcards.js
Original file line number Diff line number Diff line change
Expand Up @@ -717,12 +717,11 @@ class PlayCards extends React.Component {
<Carousel className="carousel">
{this.state.flashcards.map((item) => {
return (
<main className="carousel__items">
<main className="carousel__items" key={item.id}>
<div
// style={{border: "5px dotted limeGreen", cursor: "none !important"}}
/>
<Flippy
key={item.id}
flipOnHover={false}
flipOnClick={true}
flipDirection="horizontal"
Expand Down
Loading