Tailwind conversion halfway done

This commit is contained in:
Vinson Zheng
2024-02-16 16:34:06 -06:00
parent 6b7e45b5f4
commit d21843468b
4 changed files with 18 additions and 43 deletions

View File

@@ -1,6 +1,3 @@
@use 'sass:color';
@use 'src/views/styles/colors.module.scss';
.dayLabelContainer {
display: flex;
flex-direction: row;
@@ -32,7 +29,6 @@
.day {
gap: 5px;
color: colors.$burnt_orange;
text-align: center;
font-size: 14.22px;
font-style: normal;

View File

@@ -1,5 +1,4 @@
import React from 'react';
import styles from './CalendarGrid.module.scss';
import CalendarCell from '../CalendarGridCell/CalendarGridCell';
import { DAY_MAP } from 'src/shared/types/CourseMeeting';
@@ -9,11 +8,12 @@ const grid = [];
for (let i = 0; i < 13; i++) {
const row = [];
let hour = hoursOfDay[i];
row.push(<>
<div key={hour} className={styles.timeBlock}>
<div className={styles.timeLabelContainer}><p>{(hour % 12 === 0 ? 12 : hour % 12) + (hour < 12 ? ' AM' : ' PM')}</p></div>
row.push(
<div key={hour} className="flex">
<div className="flex flex-col items-end">
<p className="text-left">{(hour % 12 === 0 ? 12 : hour % 12) + (hour < 12 ? ' AM' : ' PM')}</p>
</div>
</div>
</>
);
row.push(Array.from({ length: 5 }, (_, j) => <CalendarCell key={j} />));
grid.push(row);
@@ -25,26 +25,26 @@ for (let i = 0; i < 13; i++) {
*/
const Calendar: React.FC = (props) => {
return (
<div className={styles.calendar}>
<div className={styles.dayLabelContainer}>
<div className="grid grid-cols-7">
<div className="flex justify-center items-center h-13 min-w-40 min-h-13 pb-15 gap-10 flex-1">
</div>
{/* Displaying the rest of the calendar */}
<div className={styles.timeAndGrid}>
{/* <div className={styles.timeColumn}>
<div className={styles.timeBlock}></div>
<div className="flex">
{/* <div className="flex flex-col justify-between items-start flex-1">
<div className="flex"></div>
{hoursOfDay.map((hour) => (
<div key={hour} className={styles.timeBlock}>
<div className={styles.timeLabelContainer}>
<div key={hour} className="flex">
<div className="flex flex-col items-end">
<p>{hour % 12 === 0 ? 12 : hour % 12} {hour < 12 ? 'AM' : 'PM'}</p>
</div>
</div>
))}
</div> */}
<div className={styles.calendarGrid}>
<div className="grid grid-cols-6 grid-rows-13">
{/* Displaying day labels */}
<div className={styles.timeBlock}></div>
<div className="flex"></div>
{daysOfWeek.map(day => (
<div key={day} className={styles.day}>
<div key={day} className="border border-solid border-gray-300 text-center">
{day}
</div>
))}

View File

@@ -1,18 +0,0 @@
.calendarCell {
display: flex;
width: 213.8px;
height: 44.769px;
min-width: 45px;
min-height: 40px;
flex-direction: column;
justify-content: center;
align-items: flex-start;
border: 1px solid #DADCE0;
}
.hourLine {
width: 213.8px;
height: 1px;
border-radius: var(--border-radius-none, 0px);
background: rgba(218, 220, 224, 0.25);
}

View File

@@ -1,5 +1,4 @@
import React from 'react';
import styles from './CalendarGridCell.module.scss';
/**
* Component representing each 1 hour time block of a calendar
@@ -7,10 +6,8 @@ import styles from './CalendarGridCell.module.scss';
*/
const CalendarCell: React.FC = (props) => {
return (
<div className={styles.calendarCell}>
<div className={styles.hourLine}>
</div>
<div className="flex w-56 h-12 min-w-12 min-h-10 flex-col justify-center items-start border border-gray-300">
<div className="w-full h-1 border-none rounded-none bg-gray-300 bg-opacity-25"></div>
</div>
);
};