Skip to content
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

Netlify patch #20

Open
wants to merge 55 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
3a7d246
Add components and pages folder
RokPopov Sep 14, 2020
51281ca
pair programming types and basic setup for dispatch
Bartan89 Sep 14, 2020
6121865
Merge pull request #1 from RokPopov/types
Bartan89 Sep 14, 2020
03daae4
setting up redux for whole project
Bartan89 Sep 14, 2020
1ad0fa0
Merge pull request #2 from RokPopov/setting-up-redux
Bartan89 Sep 14, 2020
b177cd4
we setup redux to work with a temp canvas in html and temp input
Bartan89 Sep 14, 2020
e6b9508
Merge pull request #3 from RokPopov/store-note-in-redux
Bartan89 Sep 14, 2020
2bce92b
Add canvas component
RokPopov Sep 14, 2020
ebbfc28
some shortcuts for working with global types
Bartan89 Sep 14, 2020
64014f6
Merge pull request #5 from RokPopov/typesimprovement
Bartan89 Sep 14, 2020
89925d8
Merge branch 'development' into canvas
RokPopov Sep 14, 2020
108764a
Merge pull request #4 from RokPopov/canvas
RokPopov Sep 14, 2020
5a82bff
failed attempt so far at double nesting data
Bartan89 Sep 14, 2020
45e0bc2
demo ali
Bartan89 Sep 15, 2020
93a0f1f
adding in other data structures
Bartan89 Sep 15, 2020
3af303b
videoplayer and videos fethcing done
AliLotfi123 Sep 15, 2020
f5d86f3
logic for removel of individual items sound
Bartan89 Sep 15, 2020
18c1525
adding a note per timenote works
Bartan89 Sep 15, 2020
403623a
searching is done
AliLotfi123 Sep 15, 2020
9827135
implemented range setting
Bartan89 Sep 15, 2020
161b782
search and first video work
AliLotfi123 Sep 15, 2020
467defc
videoplayer is ready for merging with react-redux
AliLotfi123 Sep 15, 2020
42757ab
Merge pull request #6 from RokPopov/videoPlayer
AliLotfi123 Sep 16, 2020
5a34b76
added library feature
Bartan89 Sep 16, 2020
6458795
Merge branch 'development' into simulate-timeline
Bartan89 Sep 16, 2020
6b74ed4
Merge pull request #7 from RokPopov/simulate-timeline
Bartan89 Sep 16, 2020
326137a
pair programming setting up redux for video
Bartan89 Sep 16, 2020
23f89cd
Merge pull request #8 from RokPopov/cleanup-after-coming-together
Bartan89 Sep 16, 2020
773b13b
Fetch the data of the video length in Notetaker component
RokPopov Sep 16, 2020
2cd9fc4
time and video works with redux
AliLotfi123 Sep 16, 2020
9cd5d72
Configure fetching the current time of time slider in Notetaker compo…
RokPopov Sep 16, 2020
0337b84
Merge pull request #9 from RokPopov/curTime-selector
RokPopov Sep 16, 2020
9c1e5ff
selectors added
AliLotfi123 Sep 16, 2020
c6bb080
Merge branch 'development' into videoselector
AliLotfi123 Sep 16, 2020
98ccc0b
Merge pull request #10 from RokPopov/videoselector
AliLotfi123 Sep 16, 2020
3b758fb
jump to fix
AliLotfi123 Sep 16, 2020
37e2e20
fixes selector
AliLotfi123 Sep 16, 2020
6f1909c
working videoselector
AliLotfi123 Sep 16, 2020
55659ba
Merge pull request #11 from RokPopov/videoselector
AliLotfi123 Sep 16, 2020
0509839
Configure slider in Notetaker component
RokPopov Sep 16, 2020
f5937b3
setup of timeline
AliLotfi123 Sep 16, 2020
a6a958f
Merge pull request #12 from RokPopov/videoselector
AliLotfi123 Sep 16, 2020
8af4703
timeline finished
AliLotfi123 Sep 16, 2020
a38e61a
Merge branch 'development' into settimeline
AliLotfi123 Sep 16, 2020
8fa8c9f
Merge pull request #14 from RokPopov/settimeline
AliLotfi123 Sep 16, 2020
06ab6da
Merge branch 'development' of github.com:RokPopov/Noteassieur-FrontEn…
RokPopov Sep 16, 2020
40c9d50
Change the styling of sliders, remove the Notetaker component from Ap…
RokPopov Sep 16, 2020
a4b830d
Merge pull request #15 from RokPopov/style-sliders
RokPopov Sep 16, 2020
d0d25ee
note display and edit with range, partial done
Bartan89 Sep 17, 2020
93a6a68
Merge pull request #16 from RokPopov/cleaning-up-with-rok
Bartan89 Sep 17, 2020
071ce0f
solved timing on timeline for notes etc
Bartan89 Sep 17, 2020
0eda492
Merge pull request #17 from RokPopov/cleaning-up-with-rok
Bartan89 Sep 17, 2020
2126f7b
Add readme file
RokPopov Sep 17, 2020
e365ae8
Merge pull request #18 from RokPopov/adding-readme
RokPopov Sep 17, 2020
bf77c08
Create _redirects
RokPopov Sep 17, 2020
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
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SKIP_PREFLIGHT_CHECK=true
94 changes: 94 additions & 0 deletions R.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
# 🪒Captain Barber 🪒

Captain Barber is a portfolio project where you can search for barbershops in Amsterdam, see and write their reviews, rate them and add new barbershops. You can see the information about the services they provide so you can compare the prices and decide where to book your appointment. You can also find contact information for each barbershop and locate them on a map, so you always know where to go to get that clean cut.

## Table of contents:

- **[Goals for this Project](#goals-for-this-project)**
- **[User Stories](#user-stories)**
- **[App Demo](#app-demo)**
- **[Working Version](#working-version)**
- **[Database Diagram](#database-diagram)**
- **[Project-Board](#kanban-task-board)**
- **[Wireframe](#wireframe)**
- **[Backend](#backend)**
- **[Technologies Used](#technologies-used)**
- **[Git Version Control](#git-version-control)**
- **[SETUP](#getting-started)**

## Goals for this Project

The goal of this project is to build a frontend app, in a working group of three.
With this project, we are trying to:

- build a demo version in four days
- apply the technologies we learned in Codaisseur Bootcamp
- showcase implementation of new technologies
- work in a team

## User Stories

- As a page visitor, I can sign up and log in as a user. I must register before I can post reviews and like barbershops.
- As a page visitor, I am able see existing barbershops, their rates and reviews. I can see them sorted by their rates in a descending order.
- As a page visitor, I am able to see the name of the user, that posted a review and the time and date of when it was posted.
- As a page visitor, I am able to see the existing barbershops on a map and get to their detail page when clicking on them.
- As a logged in user, I am able to rate and review barbershops.
- As a barbershop owner, I can log in as a barbershop owner.
- As a logged in barbershop owner, I am able to add a new barbershop to the list of barbershops.

## App Demo

to do []

![Captain Barber Demo](CaptainBarberAppDemo.gif)

## Working Version

to do []

[Link to Captain Barber](https://captainbarber.netlify.app/)

## Database Diagram

[Link to the DB diagram](https://dbdiagram.io/d/5f5fa0db7da1ea736e2dd012)

(made for future development)

## Project Board

[Link to the project board](https://github.com/RokPopov/Noteassieur-FrontEnd/projects/2)

## Wireframe

[Link to the wireframe](https://www.figma.com/file/9adXlJp320LdAFDy2icKdD/Untitled?node-id=1%3A2)

## Backend

[Link to the server side of the project](https://github.com/RokPopov/Noteassieur-BackEnd)

(made for future development)

## Technologies Used

- TypeScript
- React
- React Router DOM
- Redux
- Redux Thunk
- Html, JSX
- CSS, Material-UI

## Git Version Control

In this project I try to implement solid version control:

- write clear commit messages
- name branches by features
- do pull requests with meaningful summaries

## SETUP Getting started

- clone your app
- cd into your project
- npm install
- npm start
1 change: 1 addition & 0 deletions _redirects
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/* /index.html 200
Loading