Skip to content

Commit

Permalink
Merge branch 'deploy'
Browse files Browse the repository at this point in the history
# Conflicts:
#	frontend/src/Components/Scheduling.js
  • Loading branch information
TobiasSchaeuble-EH committed Oct 29, 2023
2 parents 8bef121 + 53267b3 commit bef7b23
Show file tree
Hide file tree
Showing 3 changed files with 113 additions and 8 deletions.
3 changes: 0 additions & 3 deletions frontend/src/App.js
Expand Up @@ -6,7 +6,6 @@ import Login from './Components/Login';
import Navigation from './Components/Navigation';
// import { useNavigate, useDispatch } from "react-router-dom";
import Profile from './Components/Profile';
import Status from './Components/Status';
import {useSelector} from 'react-redux'; // import useSelector from react-redux
import { Route, Navigate, Routes, useNavigate } from 'react-router-dom'; // import Route and Navigate from react-router-dom
import Scheduling from './Components/Scheduling';
Expand Down Expand Up @@ -68,8 +67,6 @@ function App() {
onGroupSizeChange={handleGroupSizeChange} // Changed from props.onGroupSizeChange
onTimeSlotChange={handleTimeSlotChange}
/>
<Status isScheduled={props.isScheduled} />
<Status isScheduled={!props.isScheduled} />
</div>
);
}
Expand Down
17 changes: 12 additions & 5 deletions frontend/src/Components/Scheduling.js
@@ -1,9 +1,9 @@
import React from 'react';
import '../SCSS/scheduling.css';
import Status from './Status';
import {useDispatch} from 'react-redux';
import {useSelector} from 'react-redux'; // import useSelector from react-redux
import { addUserToScheduling } from '../store/scheduling';

const Scheduling = (props) => {
const dispatch = useDispatch()
const user = useSelector((state) => state.session.user);
Expand Down Expand Up @@ -31,6 +31,7 @@ const Scheduling = (props) => {
dispatch(addUserToScheduling(userId))
}
return (
<>
<div className="scheduling-container">
<div className="scheduling-header">
Fancy having lunch together with interesting people?
Expand All @@ -53,7 +54,10 @@ const Scheduling = (props) => {
</select>
</div>
</div>
<div className="guests-slider">
<div className="view-all-container">
<button className="view-all-button" onClick={featureSoon}>Search match</button>
</div>
{/* <div className="guests-slider">
<div className="slider">
<strong>Group Size:</strong>
<input
Expand All @@ -67,9 +71,9 @@ const Scheduling = (props) => {
/>
{props.groupSize} Persons
</div>
</div>
</div> */}
</div>
<div className="actions-container">
{/* <div className="actions-container">
<div className="quick-actions">
<button className="view-all-button" onClick={sendSchedulingData}>Randomize</button>
<p>Use default settings for a quick match.</p>
Expand All @@ -83,8 +87,11 @@ const Scheduling = (props) => {
</div>
<div className="view-all-container">
<button className="view-all-button">View All Matches</button>
</div>
</div> */}
</div>
<Status isScheduled={props.isScheduled} />
<Status isScheduled={!props.isScheduled} />
</>
);
};
export default Scheduling;
101 changes: 101 additions & 0 deletions frontend/src/Components/Scheduling.js.orig
@@ -0,0 +1,101 @@
import React from 'react';
import '../SCSS/scheduling.css';
<<<<<<< HEAD
import {useDispatch} from 'react-redux';
import {useSelector} from 'react-redux'; // import useSelector from react-redux
import { addUserToScheduling } from '../store/scheduling';
=======
import Status from './Status';
>>>>>>> deploy

const Scheduling = (props) => {
const dispatch = useDispatch()
const user = useSelector((state) => state.session.user);
const userId = user?.user?.id;


const generateTimeSlots = () => {
let slots = [];
for (let i = 11; i <= 14; i++) {
for (let j = 0; j < 60; j += 30) {
if (i === 14 && j > 0) break; // Avoid adding 14:30
const hour = String(i).padStart(2, '0');
const minute = String(j).padStart(2, '0');
slots.push(`${hour}:${minute}`);
}
}
return slots;
};

const featureSoon = () => {
window.alert('Feature coming soon!');
};

const sendSchedulingData = () => {
dispatch(addUserToScheduling(userId))
}
return (
<>
<div className="scheduling-container">
<div className="scheduling-header">
Fancy having lunch together with interesting people?
</div>
<div className="time-dropdown-guests-slider">
<div className="time-dropdown">
<div>
<strong>Time Slot:</strong>
<select
value={props.timeSlot}
onChange={(e) =>
props.onTimeSlotChange(e.target.value)
}
>
{generateTimeSlots().map((slot, index) => (
<option key={index} value={slot}>
{slot}
</option>
))}
</select>
</div>
</div>
<div className="view-all-container">
<button className="view-all-button" onClick={featureSoon}>Search match</button>
</div>
{/* <div className="guests-slider">
<div className="slider">
<strong>Group Size:</strong>
<input
type="range"
min="2"
max="4"
value={props.groupSize}
onChange={(e) =>
props.onGroupSizeChange(e.target.value)
}
/>
{props.groupSize} Persons
</div>
</div> */}
</div>
{/* <div className="actions-container">
<div className="quick-actions">
<button className="view-all-button" onClick={sendSchedulingData}>Randomize</button>
<p>Use default settings for a quick match.</p>
</div>
<div className="advanced-actions">
<button className="view-all-button" onClick={featureSoon}>
Customize
</button>
<p>Adjust settings to find your perfect match.</p>
</div>
</div>
<div className="view-all-container">
<button className="view-all-button">View All Matches</button>
</div> */}
</div>
<Status isScheduled={props.isScheduled} />
<Status isScheduled={!props.isScheduled} />
</>
);
};
export default Scheduling;

0 comments on commit bef7b23

Please sign in to comment.